merge fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16d6cd9207af631b722dbcfc39923a36dc8eb988..9f16a677bbb65998cfe1f1bb1f79b812ee6e2298 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -261,7 +261,6 @@
        * cus-start.el (x-use-underline-position-properties):
        Allow customization.
 
->>>>>>> 1.3434
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
        * dired.el (dired-load-hook, dired-mode-hook)